Moved WebKit examples and demos to their own repository.

This was agreed with the WebKit team.

63 files changed, 54 insertions, 58 deletions

diff --git a/modularize b/modularize
index 27cf248..5050c9e 100755
--- a/modularize
+++ b/modularize
@@ -39,7 +39,7 @@ my $good_master_sha1 = '175b4905c0cdd9d79baba2121cda2ac52ae547a7';
 
 our @repos = ('qtkernel', 'qtsvg', 'qtquick', 'qt3support', 'activeqt',
               'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns',
-              'qttranslations', 'qtdoc', 'qlalr', 'devtools');
+              'qttranslations', 'qtdoc', 'qlalr', 'devtools', 'qtwebkit-examples-and-demos');
 
 # Whether we are using qtwebkit or webkit trunk.
 our $qtWebKitType = "webkit";
diff --git a/mother/qt.pro b/mother/qt.pro
index 35a6900..10baf7b 100644
--- a/mother/qt.pro
+++ b/mother/qt.pro
@@ -40,6 +40,10 @@ module_qtwebkit_target.commands =
 module_qtwebkit_target.depends = sub-qtwebkit-pri
 QMAKE_EXTRA_TARGETS += module_qtwebkit_target
 
+qtwebkit_examples_and_demos.subdir = $$IN_PWD/qtwebkit-examples-and-demos
+qtwebkit_examples_and_demos.target = qtwebkit-examples-and-demos
+qtwebkit_examples_and_demos.depends = module_qtwebkit
+
 module_qttools.subdir = $$IN_PWD/qttools
 module_qttools.target = module-qttools
 module_qttools.depends = module_qtkernel module_qtscript module_qtquick module_qt3support module_qtwebkit
@@ -71,5 +75,6 @@ SUBDIRS       = \
                 module_qttools \
                 module_qttranslations \
                 module_qtdoc \
+                qtwebkit_examples_and_demos \
 
 win32:SUBDIRS += module_activeqt
diff --git a/patches/0037-Made-modules-that-depend-on-other-modules-add-their-.patch b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
index 7a86175..7a86175 100644
--- a/patches/0037-Made-modules-that-depend-on-other-modules-add-their-.patch
+++ b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
diff --git a/patches/0036-Removed-example-that-is-no-longer-present-in-QtXmlPa.patch b/patches/0036-Removed-example-that-is-no-longer-present-in-QtXmlPa.patch
deleted file mode 100644
index 9c8d079..0000000
--- a/patches/0036-Removed-example-that-is-no-longer-present-in-QtXmlPa.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8c4abbcdd21aea824666021c59088f4ceff45a9f Mon Sep 17 00:00:00 2001
-From: axis <qt-info@nokia.com>
-Date: Mon, 3 Jan 2011 22:56:00 +0100
-Subject: [PATCH] Removed example that is no longer present in QtXmlPatterns.
-
----
- qtxmlpatterns/examples/xmlpatterns/xmlpatterns.pro |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/qtxmlpatterns/examples/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/examples/xmlpatterns/xmlpatterns.pro
-index 94d2145..afdc4de 100644
---- a/qtxmlpatterns/examples/xmlpatterns/xmlpatterns.pro
-+++ b/qtxmlpatterns/examples/xmlpatterns/xmlpatterns.pro
-@@ -5,9 +5,6 @@ SUBDIRS       = recipes \
-                 filetree \
-                 schema
- 
--# This example depends on QtWebkit as well.
--contains(QT_CONFIG, webkit):SUBDIRS += qobjectxmlmodel
--
- # install
- target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns
- sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlpatterns.pro README
--- 
-1.7.3.2.343.g7d43d
-
diff --git a/patches/0038-Make-each-module-refer-to-its-own-bin.patch b/patches/0037-Make-each-module-refer-to-its-own-bin.patch
index ee10894..ee10894 100644
--- a/patches/0038-Make-each-module-refer-to-its-own-bin.patch
+++ b/patches/0037-Make-each-module-refer-to-its-own-bin.patch
diff --git a/patches/0039-Add-qttranslations.pro-to-QtTranslations-module.patch b/patches/0038-Add-qttranslations.pro-to-QtTranslations-module.patch
index 4fbff0a..4fbff0a 100644
--- a/patches/0039-Add-qttranslations.pro-to-QtTranslations-module.patch
+++ b/patches/0038-Add-qttranslations.pro-to-QtTranslations-module.patch
diff --git a/patches/0040-examples.pro-removed-moved-subdirectories.patch b/patches/0039-examples.pro-removed-moved-subdirectories.patch
index 5a13222..5a13222 100644
--- a/patches/0040-examples.pro-removed-moved-subdirectories.patch
+++ b/patches/0039-examples.pro-removed-moved-subdirectories.patch
diff --git a/patches/0041-Extended-module-profiles-for-phonon.patch b/patches/0040-Extended-module-profiles-for-phonon.patch
index eef246c..eef246c 100644
--- a/patches/0041-Extended-module-profiles-for-phonon.patch
+++ b/patches/0040-Extended-module-profiles-for-phonon.patch
diff --git a/patches/0042-Make-auto-test-build.patch b/patches/0041-Make-auto-test-build.patch
index b30dcfb..46b4669 100644
--- a/patches/0042-Make-auto-test-build.patch
+++ b/patches/0041-Make-auto-test-build.patch
@@ -19,7 +19,6 @@ Subject: [PATCH] Make auto test build
  .../qdeclarativeviewer/qdeclarativeviewer.pro      |    2 +-
  qttools/tests/auto/auto.pro                        |    3 +++
  qttools/tests/auto/help.pro                        |    7 +++++++
- qtwebkit/tests/auto/auto.pro                       |    3 +++
  .../qapplicationargumentparser.pro                 |    2 +-
  .../auto/xmlpatternsschema/xmlpatternsschema.pro   |    4 +++-
  .../tests/auto/xmlpatternssdk/xmlpatternssdk.pro   |    7 ++++---
@@ -236,15 +235,6 @@ index 0000000..055703c
 +           qhelpgenerator \
 +           qhelpindexmodel \
 +           qhelpprojectdata
-diff --git a/qtwebkit/tests/auto/auto.pro b/qtwebkit/tests/auto/auto.pro
-new file mode 100644
-index 0000000..affd8a0
---- /dev/null
-+++ b/qtwebkit/tests/auto/auto.pro
-@@ -0,0 +1,3 @@
-+TEMPLATE = subdirs
-+
-+contains(QT_CONFIG, webkit):                SUBDIRS += webkit.pro
 diff --git a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
 index df32e92..80e207f 100644
 --- a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
diff --git a/patches/0043-Demos-activate-in-profiles.patch b/patches/0042-Demos-activate-in-profiles.patch
index da4f1a8..da4f1a8 100644
--- a/patches/0043-Demos-activate-in-profiles.patch
+++ b/patches/0042-Demos-activate-in-profiles.patch
diff --git a/patches/0044-compile-qtquick-import.patch b/patches/0043-compile-qtquick-import.patch
index 6695545..6695545 100644
--- a/patches/0044-compile-qtquick-import.patch
+++ b/patches/0043-compile-qtquick-import.patch
diff --git a/patches/0045-Move-uitools-from-QtTools-to-QtKernel.patch b/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch
index 9d1f000..9d1f000 100644
--- a/patches/0045-Move-uitools-from-QtTools-to-QtKernel.patch
+++ b/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch
diff --git a/patches/0046-Enable-webkit-in-assistant.patch b/patches/0045-Enable-webkit-in-assistant.patch
index 5eb2b29..5eb2b29 100644
--- a/patches/0046-Enable-webkit-in-assistant.patch
+++ b/patches/0045-Enable-webkit-in-assistant.patch
diff --git a/patches/0047-Use-correct-DESTDIR-for-UiTools.patch b/patches/0046-Use-correct-DESTDIR-for-UiTools.patch
index d26d317..d26d317 100644
--- a/patches/0047-Use-correct-DESTDIR-for-UiTools.patch
+++ b/patches/0046-Use-correct-DESTDIR-for-UiTools.patch
diff --git a/patches/0048-Added-new-QtWebKit-requirements-since-we-need-more-t.patch b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
index e0a189c..e0a189c 100644
--- a/patches/0048-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
+++ b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
diff --git a/patches/0049-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch b/patches/0048-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch
index fac9fd7..fac9fd7 100644
--- a/patches/0049-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch
+++ b/patches/0048-Add-QMAKESPEC_ORIGINAL-to-the-INCLUDEPATH-when-neede.patch
diff --git a/patches/0050-Make-configure.exe-compile-and-handle-eligible-modul.patch b/patches/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch
index 54b9c0a..54b9c0a 100644
--- a/patches/0050-Make-configure.exe-compile-and-handle-eligible-modul.patch
+++ b/patches/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch
diff --git a/patches/0051-New-configure.exe-binary.patch b/patches/0050-New-configure.exe-binary.patch
index e953cb1..e953cb1 100644
--- a/patches/0051-New-configure.exe-binary.patch
+++ b/patches/0050-New-configure.exe-binary.patch
diff --git a/patches/0052-qdoc3-is-moved-from-qttools-to-qtdoc.patch b/patches/0051-qdoc3-is-moved-from-qttools-to-qtdoc.patch
index 7ead9c6..7ead9c6 100644
--- a/patches/0052-qdoc3-is-moved-from-qttools-to-qtdoc.patch
+++ b/patches/0051-qdoc3-is-moved-from-qttools-to-qtdoc.patch
diff --git a/patches/0053-Added-correct-include-paths-for-Designer-plugins.patch b/patches/0052-Added-correct-include-paths-for-Designer-plugins.patch
index 4a6061c..4a6061c 100644
--- a/patches/0053-Added-correct-include-paths-for-Designer-plugins.patch
+++ b/patches/0052-Added-correct-include-paths-for-Designer-plugins.patch
diff --git a/patches/0054-Removed-activeqt-references-from-qttools-which-is-in.patch b/patches/0053-Removed-activeqt-references-from-qttools-which-is-in.patch
index 3c00fda..3c00fda 100644
--- a/patches/0054-Removed-activeqt-references-from-qttools-which-is-in.patch
+++ b/patches/0053-Removed-activeqt-references-from-qttools-which-is-in.patch
diff --git a/patches/0055-De-bootstrapped-lrelease.patch b/patches/0054-De-bootstrapped-lrelease.patch
index 9910227..9910227 100644
--- a/patches/0055-De-bootstrapped-lrelease.patch
+++ b/patches/0054-De-bootstrapped-lrelease.patch
diff --git a/patches/0056-Fixed-a-bug-in-libdir-handling.patch b/patches/0055-Fixed-a-bug-in-libdir-handling.patch
index 30ccd47..30ccd47 100644
--- a/patches/0056-Fixed-a-bug-in-libdir-handling.patch
+++ b/patches/0055-Fixed-a-bug-in-libdir-handling.patch
diff --git a/patches/0057-Fixed-wrong-inclusion-of-QtHelp-module.patch b/patches/0056-Fixed-wrong-inclusion-of-QtHelp-module.patch
index 5be2e95..5be2e95 100644
--- a/patches/0057-Fixed-wrong-inclusion-of-QtHelp-module.patch
+++ b/patches/0056-Fixed-wrong-inclusion-of-QtHelp-module.patch
diff --git a/patches/0058-Added-missing-header-to-lrelease.patch b/patches/0057-Added-missing-header-to-lrelease.patch
index 88f8c80..88f8c80 100644
--- a/patches/0058-Added-missing-header-to-lrelease.patch
+++ b/patches/0057-Added-missing-header-to-lrelease.patch
diff --git a/patches/0059-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch
index 7ed4951..7ed4951 100644
--- a/patches/0059-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch
+++ b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch
diff --git a/patches/0060-qtmultimedia-profiles.patch b/patches/0059-qtmultimedia-profiles.patch
index 280f726..280f726 100644
--- a/patches/0060-qtmultimedia-profiles.patch
+++ b/patches/0059-qtmultimedia-profiles.patch
diff --git a/patches/0061-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
index 724d6a1..724d6a1 100644
--- a/patches/0061-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
+++ b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
diff --git a/patches/0062-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch b/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch
index 7ead389..7ead389 100644
--- a/patches/0062-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch
+++ b/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch
diff --git a/patches/0063-Added-needed-profile-files-for-ActiveQt.patch b/patches/0062-Added-needed-profile-files-for-ActiveQt.patch
index 85b6296..85b6296 100644
--- a/patches/0063-Added-needed-profile-files-for-ActiveQt.patch
+++ b/patches/0062-Added-needed-profile-files-for-ActiveQt.patch
diff --git a/patches/0064-Changed-various-path-references-in-ActiveQt-to-match.patch b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
index 189a487..189a487 100644
--- a/patches/0064-Changed-various-path-references-in-ActiveQt-to-match.patch
+++ b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
diff --git a/patches/0065-Changed-references-to-ActiveQt-resources.patch b/patches/0064-Changed-references-to-ActiveQt-resources.patch
index 6bf413e..6bf413e 100644
--- a/patches/0065-Changed-references-to-ActiveQt-resources.patch
+++ b/patches/0064-Changed-references-to-ActiveQt-resources.patch
diff --git a/patches/0066-Changed-path-references-to-ActiveQt.patch b/patches/0065-Changed-path-references-to-ActiveQt.patch
index c2af3cc..c2af3cc 100644
--- a/patches/0066-Changed-path-references-to-ActiveQt.patch
+++ b/patches/0065-Changed-path-references-to-ActiveQt.patch
diff --git a/patches/0067-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch b/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch
index 4d0c6cf..4d0c6cf 100644
--- a/patches/0067-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch
+++ b/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch
diff --git a/patches/0068-Generate-correct-headers.pri-for-the-phonon-module.patch b/patches/0067-Generate-correct-headers.pri-for-the-phonon-module.patch
index 0e22883..0e22883 100644
--- a/patches/0068-Generate-correct-headers.pri-for-the-phonon-module.patch
+++ b/patches/0067-Generate-correct-headers.pri-for-the-phonon-module.patch
diff --git a/patches/0069-Use-the-correct-headers.pri-for-designer.patch b/patches/0068-Use-the-correct-headers.pri-for-designer.patch
index 4327be4..4327be4 100644
--- a/patches/0069-Use-the-correct-headers.pri-for-designer.patch
+++ b/patches/0068-Use-the-correct-headers.pri-for-designer.patch
diff --git a/patches/0070-Use-the-correct-flags-for-linking-to-QtUitools.patch b/patches/0069-Use-the-correct-flags-for-linking-to-QtUitools.patch
index 34b95c4..34b95c4 100644
--- a/patches/0070-Use-the-correct-flags-for-linking-to-QtUitools.patch
+++ b/patches/0069-Use-the-correct-flags-for-linking-to-QtUitools.patch
diff --git a/patches/0071-Generate-lrelease-without-application-bundle-on-Mac.patch b/patches/0070-Generate-lrelease-without-application-bundle-on-Mac.patch
index fb2b945..fb2b945 100644
--- a/patches/0071-Generate-lrelease-without-application-bundle-on-Mac.patch
+++ b/patches/0070-Generate-lrelease-without-application-bundle-on-Mac.patch
diff --git a/patches/0072-Corrected-include.patch b/patches/0071-Corrected-include.patch
index da6805c..da6805c 100644
--- a/patches/0072-Corrected-include.patch
+++ b/patches/0071-Corrected-include.patch
diff --git a/patches/0073-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch
index 366a5d5..366a5d5 100644
--- a/patches/0073-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch
+++ b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch
diff --git a/patches/0074-Avoid-recursively-including-the-same-arch.pri-file.patch b/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch
index 75d7bad..75d7bad 100644
--- a/patches/0074-Avoid-recursively-including-the-same-arch.pri-file.patch
+++ b/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch
diff --git a/patches/0075-Properly-detect-qmodule.pri.patch b/patches/0074-Properly-detect-qmodule.pri.patch
index e909e7e..e909e7e 100644
--- a/patches/0075-Properly-detect-qmodule.pri.patch
+++ b/patches/0074-Properly-detect-qmodule.pri.patch
diff --git a/patches/0076-Wrap-string-in-qPrintable-with-QString.patch b/patches/0075-Wrap-string-in-qPrintable-with-QString.patch
index 4562fd3..4562fd3 100644
--- a/patches/0076-Wrap-string-in-qPrintable-with-QString.patch
+++ b/patches/0075-Wrap-string-in-qPrintable-with-QString.patch
diff --git a/patches/0077-Build-qdoc3-properly-after-modularization.patch b/patches/0076-Build-qdoc3-properly-after-modularization.patch
index fafffba..fafffba 100644
--- a/patches/0077-Build-qdoc3-properly-after-modularization.patch
+++ b/patches/0076-Build-qdoc3-properly-after-modularization.patch
diff --git a/patches/0078-define-debug_and_release-only-if-CONFIG-dosen-t-cont.patch b/patches/0077-define-debug_and_release-only-if-CONFIG-dosen-t-cont.patch
index ade3a27..ade3a27 100644
--- a/patches/0078-define-debug_and_release-only-if-CONFIG-dosen-t-cont.patch
+++ b/patches/0077-define-debug_and_release-only-if-CONFIG-dosen-t-cont.patch
diff --git a/patches/0078-Added-missing-header-to-webkit-example.patch b/patches/0078-Added-missing-header-to-webkit-example.patch
new file mode 100644
index 0000000..4132708
--- /dev/null
+++ b/patches/0078-Added-missing-header-to-webkit-example.patch
@@ -0,0 +1,24 @@
+From 6d775bb56ba24d9c3327d202a24f42b7be1e57e4 Mon Sep 17 00:00:00 2001
+From: axis <qt-info@nokia.com>
+Date: Thu, 24 Feb 2011 12:50:29 +0100
+Subject: [PATCH] Added missing header to webkit example.
+
+---
+ .../examples/webkit/fancybrowser/mainwindow.cpp    |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtwebkit-examples-and-demos/examples/webkit/fancybrowser/mainwindow.cpp b/qtwebkit-examples-and-demos/examples/webkit/fancybrowser/mainwindow.cpp
+index 2a9aa54..b30b2c4 100644
+--- a/qtwebkit-examples-and-demos/examples/webkit/fancybrowser/mainwindow.cpp
++++ b/qtwebkit-examples-and-demos/examples/webkit/fancybrowser/mainwindow.cpp
+@@ -39,6 +39,7 @@
+ ****************************************************************************/
+ 
+ #include <QtGui>
++#include <QtNetwork>
+ #include <QtWebKit>
+ #include "mainwindow.h"
+ 
+-- 
+1.7.2.2
+
diff --git a/patches/master/0038-Make-each-module-refer-to-its-own-bin.patch b/patches/master/0037-Make-each-module-refer-to-its-own-bin.patch
index a4eacc9..a4eacc9 100644
--- a/patches/master/0038-Make-each-module-refer-to-its-own-bin.patch
+++ b/patches/master/0037-Make-each-module-refer-to-its-own-bin.patch
diff --git a/patches/master/0040-examples.pro-removed-moved-subdirectories.patch b/patches/master/0039-examples.pro-removed-moved-subdirectories.patch
index aaae52a..aaae52a 100644
--- a/patches/master/0040-examples.pro-removed-moved-subdirectories.patch
+++ b/patches/master/0039-examples.pro-removed-moved-subdirectories.patch
diff --git a/patches/master/0042-Make-auto-test-build.patch b/patches/master/0041-Make-auto-test-build.patch
index 0a4d1c8..d6c943c 100644
--- a/patches/master/0042-Make-auto-test-build.patch
+++ b/patches/master/0041-Make-auto-test-build.patch
@@ -17,7 +17,6 @@ Subject: [PATCH] Make auto test build
  .../tests/auto/declarative/examples/examples.pro   |    2 +-
  .../qdeclarativesqldatabase.pro                    |    2 +-
  .../qdeclarativeviewer/qdeclarativeviewer.pro      |    2 +-
- qtwebkit/tests/auto/auto.pro                       |    3 +++
  .../qapplicationargumentparser.pro                 |    2 +-
  .../auto/xmlpatternsschema/xmlpatternsschema.pro   |    4 +++-
  .../tests/auto/xmlpatternssdk/xmlpatternssdk.pro   |    7 ++++---
@@ -210,15 +209,6 @@ index 8d4b410..46a3dae 100644
  
  SOURCES += tst_qdeclarativeviewer.cpp
  
-diff --git a/qtwebkit/tests/auto/auto.pro b/qtwebkit/tests/auto/auto.pro
-new file mode 100644
-index 0000000..affd8a0
---- /dev/null
-+++ b/qtwebkit/tests/auto/auto.pro
-@@ -0,0 +1,3 @@
-+TEMPLATE = subdirs
-+
-+contains(QT_CONFIG, webkit):                SUBDIRS += webkit.pro
 diff --git a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
 index df32e92..80e207f 100644
 --- a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
diff --git a/patches/master/0045-Move-uitools-from-QtTools-to-QtKernel.patch b/patches/master/0044-Move-uitools-from-QtTools-to-QtKernel.patch
index 453bc05..453bc05 100644
--- a/patches/master/0045-Move-uitools-from-QtTools-to-QtKernel.patch
+++ b/patches/master/0044-Move-uitools-from-QtTools-to-QtKernel.patch
diff --git a/patches/master/0048-Added-new-QtWebKit-requirements-since-we-need-more-t.patch b/patches/master/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
index e981db0..e981db0 100644
--- a/patches/master/0048-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
+++ b/patches/master/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
diff --git a/patches/master/0050-Make-configure.exe-compile-and-handle-eligible-modul.patch b/patches/master/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch
index 0b6af0e..0b6af0e 100644
--- a/patches/master/0050-Make-configure.exe-compile-and-handle-eligible-modul.patch
+++ b/patches/master/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch
diff --git a/patches/master/0054-Removed-activeqt-references-from-qttools-which-is-in.patch b/patches/master/0053-Removed-activeqt-references-from-qttools-which-is-in.patch
index 2026b1b..2026b1b 100644
--- a/patches/master/0054-Removed-activeqt-references-from-qttools-which-is-in.patch
+++ b/patches/master/0053-Removed-activeqt-references-from-qttools-which-is-in.patch
diff --git a/patches/master/0056-Fixed-a-bug-in-libdir-handling.patch b/patches/master/0055-Fixed-a-bug-in-libdir-handling.patch
index 521e957..521e957 100644
--- a/patches/master/0056-Fixed-a-bug-in-libdir-handling.patch
+++ b/patches/master/0055-Fixed-a-bug-in-libdir-handling.patch
diff --git a/patches/master/0060-qtmultimedia-profiles.patch b/patches/master/0059-qtmultimedia-profiles.patch
index 038ae32..038ae32 100644
--- a/patches/master/0060-qtmultimedia-profiles.patch
+++ b/patches/master/0059-qtmultimedia-profiles.patch
diff --git a/patches/master/0061-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch b/patches/master/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
index a8d6460..a8d6460 100644
--- a/patches/master/0061-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
+++ b/patches/master/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
diff --git a/patches/master/0062-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch b/patches/master/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch
index 69dbfdb..69dbfdb 100644
--- a/patches/master/0062-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch
+++ b/patches/master/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch
diff --git a/patches/master/0074-Avoid-recursively-including-the-same-arch.pri-file.patch b/patches/master/0073-Avoid-recursively-including-the-same-arch.pri-file.patch
index e51c42f..e51c42f 100644
--- a/patches/master/0074-Avoid-recursively-including-the-same-arch.pri-file.patch
+++ b/patches/master/0073-Avoid-recursively-including-the-same-arch.pri-file.patch
diff --git a/patches/master/0076-Wrap-string-in-qPrintable-with-QString.patch b/patches/master/0075-Wrap-string-in-qPrintable-with-QString.patch
index 0805394..0805394 100644
--- a/patches/master/0076-Wrap-string-in-qPrintable-with-QString.patch
+++ b/patches/master/0075-Wrap-string-in-qPrintable-with-QString.patch
diff --git a/scripts/200_examples b/scripts/200_examples
index e05b9e4..41c5a9e 100644
--- a/scripts/200_examples
+++ b/scripts/200_examples
@@ -39,19 +39,19 @@ if ($isMaster) {
     ensureDir("qtkernel/examples/scroller");
     run("git mv examples/scroller/graphicsview qtkernel/examples/scroller/graphicsview");
     run("git mv examples/scroller/wheel qtkernel/examples/scroller/wheel");
-    ensureDir("qtwebkit/examples/scroller");
+    ensureDir("qtwebkit-examples-and-demos/examples/scroller");
     run("git mv examples/scroller/plot qtkernel/examples/scroller/plot");
     run("git rm -q examples/scroller/scroller.pro");
-    createSubdirProfile("qtwebkit/examples/scroller");
+    createSubdirProfile("qtwebkit-examples-and-demos/examples/scroller");
     createSubdirProfile("qtkernel/examples/scroller");
 }
 
 ensureDir("qtscript/examples");
 run("git mv examples/script qtscript/examples");
 
-ensureDir("qtwebkit/examples/xmlpatterns");
+ensureDir("qtxmlpatterns/examples");
 # Uses both xmlpatterns and webkit.
-run("git mv examples/xmlpatterns/qobjectxmlmodel qtwebkit/examples/xmlpatterns");
+run("git mv examples/xmlpatterns qtxmlpatterns/examples");
 
 ensureDir("activeqt/examples");
 run("git mv examples/activeqt activeqt/examples");
@@ -66,6 +66,7 @@ foreach (@examples) {
 
     my $dir = findDirectoryForApplication($example);
     if ($dir) {
+        $dir =~ s,qtwebkit$,qtwebkit-examples-and-demos,;
         print("$example -> $dir/$example\n") if ($debugExamplesScript);
         my $containingDir = dirname("$dir/$example");
         ensureDir($containingDir);
@@ -87,5 +88,6 @@ createSubdirProfile("qtxmlpatterns/examples");
 createSubdirProfile("qtquick/examples");
 createSubdirProfile("phonon/examples");
 createSubdirProfile("qtmultimedia/examples");
+createSubdirProfile("qtwebkit-examples-and-demos/examples");
 
 return 1;
diff --git a/scripts/220_demos b/scripts/220_demos
index 5a265b9..67fa5a3 100644
--- a/scripts/220_demos
+++ b/scripts/220_demos
@@ -45,6 +45,7 @@ foreach (@demos) {
 
     my $dir = findDirectoryForApplication($demo);
     if ($dir) {
+        $dir =~ s,qtwebkit$,qtwebkit-examples-and-demos,;
         print("$demo -> $dir/$demo\n") if ($debugDemosScript);
         my $containingDir = dirname("$dir/$demo");
         ensureDir($containingDir);
@@ -65,5 +66,8 @@ createSubdirProfile("qtquick/demos");
 createSubdirProfile("qtquick/demos/embedded");
 createSubdirProfile("qtmultimedia/demos");
 createSubdirProfile("qtdoc/demos");
+createSubdirProfile("qtwebkit-examples-and-demos/demos/embedded");
+createSubdirProfile("qtwebkit-examples-and-demos/demos");
+createSubdirProfile("qtwebkit-examples-and-demos");
 
 return 1;
diff --git a/scripts/300_autotests b/scripts/300_autotests
index 8474b0b..b9d6864 100644
--- a/scripts/300_autotests
+++ b/scripts/300_autotests
@@ -28,19 +28,27 @@ sub processProfile {
     $profile = "tests/auto/$profile";
     my $module = $_[1];
 
-    ensureDir("$module/tests/auto");
+    ensureDir("$module/tests/auto") if ($module);
     my @stat = stat($profile);
     open($readFd, "< $profile") or die("Could not open $profile");
     while (<$readFd>) {
          if (/([\.a-z0-9_]+)/) {
             $candidate = $1;
             if (-d "tests/auto/$candidate") {
-                run ("git mv tests/auto/$candidate $module/tests/auto/");
+                if (!$module) {
+                    run ("git rm -rfq tests/auto/$candidate");
+                } else {
+                    run ("git mv tests/auto/$candidate $module/tests/auto/");
+                }
             }
         }
     }
     close($readFd);
-    run("git mv $profile $module/tests/auto/");
+    if (!$module) {
+        run("git rm -fq $profile");
+    } else {
+        run("git mv $profile $module/tests/auto/");
+    }
 }
 
 #process each .pro file
@@ -59,7 +67,7 @@ processProfile("script.pro", "qtscript");
 processProfile("phonon.pro", "phonon");
 processProfile("svg.pro", "qtsvg");
 processProfile("multimedia.pro", "qtmultimedia");
-processProfile("webkit.pro", "qtwebkit");
+processProfile("webkit.pro", "");
 processProfile("help.pro", "qttools");
 
 ensureDir("qtquick/tests/auto");
diff --git a/scripts/400_util b/scripts/400_util
index 826b428..cbef868 100644
--- a/scripts/400_util
+++ b/scripts/400_util
@@ -44,8 +44,7 @@ run("git mv util/scripts qtkernel/util/");
 ensureDir("qtscript/util");
 run("git mv util/webkit/mkdist-javascriptcore qtscript/util/");
 
-ensureDir("qtwebkit/util");
-run("git mv util/webkit/mkdist-webkit qtwebkit/util/");
+run("git rm -fq util/webkit/mkdist-webkit");
 
 
 ensureDir("devtools/util");
@@ -76,4 +75,4 @@ run("git add qlalr/qlalr.pro");
 # I have no clue what gencmap is.
 
 
-return 1;
\ No newline at end of file
+return 1;